projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9b51a04 24c6565)
bitkeeper revision 1.1236.25.31 (423a7d1a6b-k7RqpZEfOMfrE7le-jQ)
authordjm@sportsman.spdomain <djm@sportsman.spdomain>
Fri, 18 Mar 2005 07:02:50 +0000 (07:02 +0000)
committerdjm@sportsman.spdomain <djm@sportsman.spdomain>
Fri, 18 Mar 2005 07:02:50 +0000 (07:02 +0000)
Merge djm@kirby.fc.hp.com://home/djm/src/xen/xeno-unstable-ia64.bk
into sportsman.spdomain:/home/djm/xeno-unstable-ia64.bk

1  2 
.rootkeys patch | diff1 | diff2 | blob | history
xen/arch/ia64/domain.c patch | diff1 | diff2 | blob | history

diff --cc .rootkeys
Simple merge
diff --cc xen/arch/ia64/domain.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.